[IA64] Further irq-vector fix.
authorKeir Fraser <keir.fraser@citrix.com>
Tue, 1 Sep 2009 10:32:47 +0000 (11:32 +0100)
committerKeir Fraser <keir.fraser@citrix.com>
Tue, 1 Sep 2009 10:32:47 +0000 (11:32 +0100)
Signed-off-by: KUWAMURA Shin'ya <kuwa@jp.fujitsu.com>
Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
xen/drivers/passthrough/vtd/iommu.c
xen/include/asm-ia64/mach_apic.h [new file with mode: 0644]

index ee54f359920e7f3017c8053d1d15cfe1f418483d..2f045b4dff3ff5fade48ca6b052f2242bb571102 100644 (file)
@@ -892,7 +892,11 @@ static int iommu_set_interrupt(struct iommu *iommu)
 
     irq_desc[irq].handler = &dma_msi_type;
     irq_to_iommu[irq] = iommu;
+#ifdef CONFIG_X86 
     ret = request_irq(irq, iommu_page_fault, 0, "dmar", iommu);
+#else
+    ret = request_irq_vector(irq, iommu_page_fault, 0, "dmar", iommu);
+#endif
     if ( ret )
     {
         irq_desc[irq].handler = &no_irq_type;
diff --git a/xen/include/asm-ia64/mach_apic.h b/xen/include/asm-ia64/mach_apic.h
new file mode 100644 (file)
index 0000000..3f96d74
--- /dev/null
@@ -0,0 +1 @@
+/* Leave it as blank for compilation. */